From 9860acfcbe158a1ef062e3793fe6f8780b640b0f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 19 Jun 2011 14:11:46 -0400
Subject: [PATCH] Remove remnants of GnomeCanvas

There were some random places where gail was poking at types
to see if they were a GnomeCanvas. Just remove this.
---
 gtk/a11y/gail.c         | 22 ----------------------
 gtk/a11y/gailtextutil.c |  2 +-
 gtk/a11y/gailwidget.c   |  5 +----
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 94cb142933..2a8460f53b 100644
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -157,9 +157,6 @@ gail_get_accessible_for_widget (GtkWidget *widget,
                                 gboolean  *transient)
 {
   AtkObject *obj = NULL;
-  GType gnome_canvas;
-
-  gnome_canvas = g_type_from_name ("GnomeCanvas");
 
   *transient = FALSE;
   if (!widget)
@@ -181,25 +178,6 @@ gail_get_accessible_for_widget (GtkWidget *widget,
           g_object_unref (obj);
         }
     }
-  else if (G_TYPE_CHECK_INSTANCE_TYPE ((widget), gnome_canvas))
-    {
-      GObject *focused_item;
-      GValue value = {0, };
-
-      g_value_init (&value, G_TYPE_OBJECT);
-      g_object_get_property (G_OBJECT (widget), "focused_item", &value);
-      focused_item = g_value_get_object (&value);
-
-      if (focused_item)
-        {
-          AtkObject *tmp;
-
-          obj = atk_gobject_accessible_for_object (G_OBJECT (focused_item));
-          tmp = g_object_get_qdata (G_OBJECT (obj), quark_focus_object);
-          if (tmp != NULL)
-            obj = tmp;
-        }
-    }
   else if (GTK_IS_TOGGLE_BUTTON (widget))
     {
       GtkWidget *other_widget = gtk_widget_get_parent (widget);
diff --git a/gtk/a11y/gailtextutil.c b/gtk/a11y/gailtextutil.c
index ecfd8ef785..2aec642c65 100644
--- a/gtk/a11y/gailtextutil.c
+++ b/gtk/a11y/gailtextutil.c
@@ -33,7 +33,7 @@
  * #AtkText functions which get text for accessible objects which implement
  * #AtkText.
  *
- * In GAIL it is used by the accsesible objects for #GnomeCanvasText, #GtkEntry,
+ * In GAIL it is used by the accessible objects for #GtkEntry,
  * #GtkLabel, #GtkCellRendererText and #GtkTextView.
  */
 
diff --git a/gtk/a11y/gailwidget.c b/gtk/a11y/gailwidget.c
index b68c6bb87d..358c084e8a 100644
--- a/gtk/a11y/gailwidget.c
+++ b/gtk/a11y/gailwidget.c
@@ -536,9 +536,7 @@ gail_widget_get_index_in_parent (AtkObject *accessible)
   GtkWidget *parent_widget;
   gint index;
   GList *children;
-  GType type;
 
-  type = g_type_from_name ("GailCanvasWidget");
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
 
   if (widget == NULL)
@@ -553,8 +551,7 @@ gail_widget_get_index_in_parent (AtkObject *accessible)
 
       parent = accessible->accessible_parent;
 
-      if (GAIL_IS_NOTEBOOK_PAGE (parent) ||
-          G_TYPE_CHECK_INSTANCE_TYPE ((parent), type))
+      if (GAIL_IS_NOTEBOOK_PAGE (parent))
         return 0;
       else
         {
-- 
2.30.2